merge with xen-unstable.hg

author awilliam@xenbuild.aw <awilliam@xenbuild.aw>

Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)

committer awilliam@xenbuild.aw <awilliam@xenbuild.aw>

Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)
author awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)
committer awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)
diff --cc tools/ioemu/patches/ioemu-ia64
Simple merge
diff --cc tools/ioemu/vl.c
Simple merge
diff --cc xen/include/asm-ia64/mm.h
Simple merge
author	awilliam@xenbuild.aw <awilliam@xenbuild.aw>
	Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)
committer	awilliam@xenbuild.aw <awilliam@xenbuild.aw>
	Thu, 27 Jul 2006 16:43:34 +0000 (10:43 -0600)
		1	2
tools/ioemu/patches/ioemu-ia64	patch \|	diff1 \|	diff2 \|	blob \| history
tools/ioemu/vl.c	patch \|	diff1 \|	diff2 \|	blob \| history
xen/include/asm-ia64/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history